Merge pull request #984 from YosysHQ/eddie/fix_982