Bug fixed for running on Linux