Added fix to regexp