fixes issues with GM 2.0