Fix for regex group