Updates for issue #1453