Fixed for upstream