fixed bug issue#18