Fix to handle new isNewRecord implementation