FIX problem with clustering in model and analyze script