Fixed bug related to non-serialized hash-tables.