Fix for FC042