Move one condition into the only place where its used