Fixing specialization for production mode as well