Pull Request for Issue 2203

Hi.

Please see me issue for the full details of what this fixes.

Thanks,
Robert