fixes

issue #40