Fix for deserializing composites with a CompositeSerializer

This addresses issue #503. See comment there.