Fix issue #1590