Fix bug with multiple success calls