code consistency again