Fix for both unix & windows compatability