really fixed the regexing this time