Renamed file, fixed bug confusing clustered/non-clustered mode