closed #536
closed #543