changes for issue #4