Fix issue#2