Use correct lookup table. Fixes #686