fixed success handling