Attempt to fix parsing issue with G