Another fix? I smell a preprocessor directive coming on....