(Issue 655) squash me