Refactor fallback callback