Fix for Linux improved