Fixing infinite recursion in cluster due to align