Short screen fix take 2