Fix issue#8