restore conditional properly