Bug fix for CRMS- Manli