Thanks again Aaron Schmischke for your help and for looking at the PR.
Fixed in master and 5.2 branches.