fixes (#21)