fix deserialize organization bug

Supersedes #510 now we know the root cause