Release build fix