should be working now with proper serialization