Fixed minor error in serialization.
Fixed stupid mistake with find function.