Fixing cascade save/populate combo issue