Include the 2nd part of the big picture fix