Merge pull request #3321 from jim-parry/jim-fix

Jim fix