Attempt to fix serializer (test does not pass)