Removed overflow check again, not sure about it