Fix issue#13