started fix on *nix build