Fix conditionals in fabric #2349