close #115
@TKasekamp the new code needs a test, to make sure it actually does,
what it should