Fix blank page issues caused by too strict check