Bug Fix: https://www.pivotaltracker.com/story/show/66468534