properly fixes #155