Squashed fix, all done