fix after 2round review