fix issue showing fields in wrong order