Fixed conditionals bug