Fixed conditional compilation