fixed issue#11