Update for issue #7