trying to fix fallback after merge