[master] Fix fit screen

Fix issue #2