Yes, you are right. Please check my new fix~