Portability fix