fixed special treatments fields