Conditional compilation fix