changed back erroneous preprocessor directives