#36 fixed

better be tested for each case again though.