fixed rider not existing bugs