SQUASH Bugfix