Additional workaround for PR#2771