Fix for Hoa usage