Fixed issue#2