Fix non serializable class