hacky attempt to address #114