Fix issue#359