Fix for conditionals