fix AF-2341 
fix AF-2341 