validation of field types
proper upstream version