Would be better to figure out why it's sometimes a string but we're rewriting all that so I'll go ahead and merge.