this works for now for both OSes