(RVC) Try to fix once for all scheduling problems