#7 an evil hack to fix the bug...