Fixed issue#93