SupportScreen was fixed
merged