Fix duplication of efforts caught by @dofelw

Fixes #1499