fix for release crash