Change on_success to always