Possible fix for Linux