Fixes an issue with GP 7.7