CFY-443 removed temp fix