here a fix for issue #1