Fix issue 322