Working on the short hopping issue
Seems to fix #6