Fix the problem that fd3b11 fixes, but in a less dirty way