Fix success handling