Fixed issue#8