Re-do the StatusCode issue