fix for squash bug #15