Update for issue #23