[fix for case 9017] Rewrote regular expression