same as #82, may break tests