I've posted a fix here, do try it out if it works for you: http://larian.com/forums/ubbthreads.php?ubb=showflat&Number=614713#Post614713

There's some minor spoiler locations in that, so be warned.