Update for issue #22