Fix for throwing too much away https://www.pivotaltracker.com/s/projects/860575/stories/54502932