Fix for FC019