think this fixes #29