some fixes

issue #1558