Fixed for unix build