conditionals in fixes