Fixes #{issue number}