Fix for overflow