fix issue #4
improve fix for #3