CR change: condition to filter so it's consistent