Fixing issue with saving related sets