Fixed portability issue