Now works in release builds