Update for correct work on UNIX