fix issue when auto assign