update for issue #4