Fixes #77 address overflow issue