Fixed for cluster extraction