commander: more robust RC failsafe, but still hotfix, needs to be rewritten