Fix issue #1924