Fixed bug finally - SQUASH!