conditional fixes