Hm, that seemed to break more than it fixed. reverted the last change.