Fixed handling of success status