Fixing instability with deserializing and instantiator order

Closes #668