diff --git a/scopesim_templates/stellar/clusters.py b/scopesim_templates/stellar/clusters.py
index ab99e4a..f3a1d36 100644
--- a/scopesim_templates/stellar/clusters.py
+++ b/scopesim_templates/stellar/clusters.py
@@ -86,12 +86,6 @@ def cluster(mass=1E3, distance=50000, core_radius=1, ra=RA0, dec=DEC0,
     spec_types = cu.mass2spt(masses)
     spec_types = cu.closest_pickles(spec_types)
 
-    # HACK: Delete this once pyckles issue #5 is solved!
-    # Check tests here to see if it works
-    for i, spt in enumerate(spec_types):
-        if spt == "M25V":
-            spec_types[i] = "M25V   "
-
     # 3. get spectra from pyckles
     pickles = pyckles.SpectralLibrary("pickles", return_style="synphot")
     unique_spts = set(spec_types)
diff --git a/scopesim_templates/stellar/stars.py b/scopesim_templates/stellar/stars.py
index d0ff32c..4811c63 100644
--- a/scopesim_templates/stellar/stars.py
+++ b/scopesim_templates/stellar/stars.py
@@ -237,7 +237,7 @@ def stars(filter_name, amplitudes, spec_types, x, y, library="pyckles",
         #            for spt in zip(cat_spec_types)]
         spectra = [Spextrum(modelclass=pickles_lib[spt]).scale_to_magnitude(
             filter_curve=filter_name, amplitude=zero)
-                   for spt in zip(cat_spec_types)]
+                   for spt in cat_spec_types]
 
     else:
         spectra = [Spextrum(library + "/" + spec.lower()).scale_to_magnitude(