Fix handling of request done