Oveflow fix