fix for https://www.pivotaltracker.com/story/show/55527852