Fix for whipkills