Fixed for Linux & Windows