Fixed issue#7