Added correct fallback on completion