Possible fix for overflow exception