Squashme: Hopefully fix it now