fixed for mac/winders too