Bug fix for CSF