Fixing the way conditions appear