fixes part (2) of https://www.pivotaltracker.com/story/show/76911936