moved command fallback logic