Fixed again Mac and Linux compatibility