Yet another linux fix (probably, should finally fix things)...