Fix for GENERIC defined for all release builds