Further fixed portability bug