Fixed Bugs in SmashListener