Sunset fix - McSweeney, James