Fixing for linux