2 files changed, 8 insertions, 4 deletions

diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 76bd4d1..082e09d 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -80,6 +80,8 @@ fromList l = unsafePerformIO $ do
     f // vec v // check "fromList" []
     return v
 
+safeRead v f = unsafePerformIO $ withForeignPtr (fptr v) $ const $ f (ptr v)
+
 {- | extracts the Vector elements to a list
 
 @> toList (linspace 5 (1,10))
@@ -87,7 +89,7 @@ fromList l = unsafePerformIO $ do
 
 -}
 toList :: Storable a => Vector a -> [a]
-toList v = unsafePerformIO $ peekArray (dim v) (ptr v)
+toList v = safeRead v $ peekArray (dim v)
 
 -- | an alternative to 'fromList' with explicit dimension, used also in the instances for Show (Vector a).
 (|>) :: (Storable a) => Int -> [a] -> Vector a
@@ -96,7 +98,7 @@ n |> l = if length l == n then fromList l else error "|> with wrong size"
 
 -- | access to Vector elements without range checking
 at' :: Storable a => Vector a -> Int -> a
-at' v n = unsafePerformIO $ peekElemOff (ptr v) n
+at' v n = safeRead v $ flip peekElemOff n
 
 -- | access to Vector elements with range checking.
 at :: Storable a => Vector a -> Int -> a
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 4c331ef..60fa7c1 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -32,8 +32,10 @@ import Numeric.GSL.Vector
 5 |> [-3.0,-0.5,2.0,4.5,7.0]@
 -}
 linspace :: Int -> (Double, Double) -> Vector Double
-linspace n (a,b) = fromList [a, a+delta .. b]
-    where delta = (b-a)/(fromIntegral n -1)
+linspace n (a,b) = add a $ scale s  $ fromList [0 .. fromIntegral n-1]
+    where scale = vectorMapValR Scale
+          add   = vectorMapValR AddConstant
+          s = (b-a)/fromIntegral (n-1)
 
 vectorMax :: Vector Double -> Double
 vectorMax = toScalarR Max