fixed for windows and linux