Short screen fix take 3