fixed reviewer issues #965 and #963