added temp fix support for windows