this fixes #29