WIP: Fixed regex syntax