Fix issue#17