Fix issue 353