Fixed for cs-compound