fix issue#17