Be more consistent