Fix for http://www.pivotaltracker.com/story/show/53737451