Does the above fix work for you?