Fixes #14 but doesn't change the Add links.