found a lot more problems related to #171