Bug fix to run in Linux