Fixes [#82771986]

https://www.pivotaltracker.com/story/show/82771986