Merge pull request #871 from dusk-network/fix