Tried to fix ICCCM once more.