Fix issue 395