Fix for FC002