Fix for address overflow error