SQUASH??? style and leak fix