Update for issue #80