Add linux compatibility - 2