Updated for issue #213