Another try at making it work on Windows