Fixed crsuh set issue