Ulrichs bug fix

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