Fixed unpleasant conditions