This is currently not working correctly but I didn't know the right way to tweak the RegExp