Fixed save with joined objects