fixed downstream problems