Fixes #791: better basic correction