squash fix, try 2