Fixed After Upstream Changes