fixed for macports
merged with remote