Fix issue#319