Works on windows too (again)