Fixing FC016 and FC017