Subtle changes for issue #6

issue #6