Fixing preprocessor logic