Simple change to improve i8 compatibility