fix for better portability