Make G11 not horribly broken