Pharaoh: Fixed download to match upload