Fixed for release builds