GMA - Oops, fixed the bug for real this time.