Fix portable issue