Handle another funny edge case where it was possible to get into a strange position