fixed issue#13