closed #472
closed #471