another try to fix those win/linux crashes :)