Make sure conditions don't get wrapped twice