corrected for better regex