actually fixed with regex this time.