updated regexp it doesn't work correctly