Can we just make this mandatory?