Hotfix/fix for new model

Fixed some bugs after modified models.