Remove screen fix temporary