Fix before support su640