Fixed correct fitting of Terminal