Fix issue#120