Fix issue 397