Fixed issue#43