Fixed non-Mac versions