final grandcanonical fix