fixed, closed #54