Fix issue#70