Fix for 1407

@SimonCropp @johnsimons code review please