Fallback with api service fix