moar random fixes without writing test cases ;x