V1.0.2 REGEX FIX