Fixed issue#107