Add hack for windows to remove arg