new fixes for issue #1