Address issue #1425