Using @gswallow fix
Merge pull request #872 from petems/patch-1

Using @gswallow fix