fixed bug related #17