Tried to fix regex stuff