Update with macports fix from terryfy