Another attempt to fix cluster