Cup serialization fixed.