fix regex problems