Fix for cluster