Added fix for Linux