#26 is solved but there seems to be a old screen issue