Fix issue#4