Fix byte overflow errors by using byte fn

Fix byte overflow errors by using byte fn #1181