fixed fields issue