fix FC002 and FC016