fixed more bugs for big values on import