Finally tracked down accuracy issues, fixes #1