fixed regex for fields