Updated according to the changes in the UnixUtils