fixed issue#5