Added workaround for crash on Linux