fix failed tests due to gcsafe