         was-drawing? (or (get-in previous-state [:drawing :in-progress?])
                          (get-in previous-state [:drawing :moving?]))
         original-layers (get-in previous-state [:drawing :original-layers])
-        layers        (map #(dissoc % :points) (get-in current-state [:drawing :layers]))]
+        layers        (mapv #(dissoc % :points) (get-in current-state [:drawing :layers]))]
     (cond
      (and (not= type "touchend")
           (not= button 2)

        [snap-move-x snap-move-y] (cameras/snap-to-grid (:camera state) move-x move-y)
        layers (get-in state [:drawing :layers])
        snap-paths? (first (filter #(not= :layer.type/path (:layer/type %)) layers))
        layers (map (fn [layer original]
                      (move-layer layer original {:snap-x snap-move-x :snap-y snap-move-y :x move-x :y move-y :snap-paths? snap-paths?}))
                    layers
                    (get-in state [:drawing :original-layers]))]
    (assoc-in state [:drawing :layers] layers)))

(defmethod control-event :mouse-moved

    (-> state
        (assoc :selected-eid group-id)
        (assoc-in [:drawing :original-layers] (conj layers group-layer))
        (assoc-in [:drawing :layers] (conj (mapv (fn [layer entity-id]
                                                   (assoc layer
                                                     :points (when (:layer/path layer) (parse-points-from-path (:layer/path layer)))
                                                     :db/id entity-id
                                                     :layer/start-x (:layer/start-x layer)
                                                     :layer/end-x (:layer/end-x layer)
                                                     :layer/current-x (:layer/end-x layer)
                                                     :layer/current-y (:layer/end-y layer)))
                                                 layers entity-ids)
                                           group-layer))
        (assoc-in [:drawing :moving?] true)
        (assoc-in [:drawing :starting-mouse-position] [rx ry])
