Merge pull request #1941 from tshepang/patch-2

allow easy fixes