Fixed whitescreen issue