Fix issue#74