Fix preprocessor for 2.x also