fix issue #6
still working on issue #6
still working on issue #6