B93049 Fix for join errors... SQUASHME

Followup to improve regexp