Fixing the (:*:) and (:+:) cases