Fixed issue #1549