Test are failing - looks like the previous fix was removed