starting to fix issue #3