Be more consistent and fix a bug