Fix for GP 7.7