Fix for https://www.pivotaltracker.com/story/show/44066767