Fixed preprocessor + scenario