Added success state back in to avoid deadlock