close #232 + correct the bug of black screen