fixing unless