fixes overflow on screen
Merge remote-tracking branch 'origin/briefcitcell_41841'