Fix issue #1998