Fix to response proper codes