fixed ##17
closed #17