0.3.1. addresses serialization issues