Fix bug with fallback-commands not called