Fix for #86
Making sure its serializable and deserializable across several JVM executions