Properly fixes #123