Fixing MR-248 - Pre-Processor Issue