more portability fix...