issue #12

last fixes