Fix issue 1385