hitchhicker bug fix