fixed hitchhikers bug