update regexp to be more precise