update to issue #6