some fix under Linux