Fix issue#320