closed #983
closed #984