Fixed model handler

 Fixed model handler