last commit addresses issue #26