Fixed behavior in windows