Fix for advanced_conditionals bug in 2.8+