Updated for issue #837