Fix https://www.pivotaltracker.com/story/show/78179388