Fixing FC017