refactor fallback method

Signed-off-by: Pooria Azimi <pooriaazimi@me.com>