Fix for FC039