Turn double modifier into a single conditional