Merge pull request #875 from dusk-network/mocello/fixed-base-width-guard