fixed serialization issues