Fixed buggy conditionals