One more validation fix for #896
Merge pull request #900 from sethmanheim/working

One more validation fix for #896