May have resolved the preprocessor issues