[JY] fix issue