update for issue #94