Better force command handling