Crash fix under Linux