Fix for changes in glh

Please merge this if it is older than 1 week.

Not yet though since I might still be making further improvements.