fixed issues with GHME