Incoming changes fix