try solving wall-of-pink issue, same with master