Fixed for Linux