fix field
fix unit test