Fixed model listener