Fixing preprocessor bug