removed unnecessary fallback