new fixes for issue #1
new fixes for issue #1