Vitter, fixes #129