fixing the conditions