Try to be more consistent