update for issue #12