Fixed a small bug with the conditions