Fixed issue #1421