Add workaround for docker bug #5490