fixes #583 hotfix to production

This is being submitted against production.