Fix faulsy conditions