New version with fixed regression in unix ...