preserve old if-flags