next portability fix