Fixed model return