Fix release build (use ConditionalAttribute instead of #if for safer refactoring)