fixes + regex