Pr88

With fix for field type