Bug fix for 78771620

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