Fix issue #1632