#96 fix for pc