Update for issue #128