Fix for CSM-775