fixed on_success handler not executing