removed portability fix again