fix to issue 1744