Some fix#2