fix FC019
Fix FC024