fix from karnes
no more preprocessor