Updated for issue #1213