super-exerimental fix #1 (to be combined with #2)... might or might not help