I've got to come up with regex to fix this, Good point! :)