Added fix for jackhammer