Fixed data not returning after recent changes.