Potential fix for latest 500 error.
Merge branch 'fixup'