Fixed with cluster decorator

Change-Id: I2cda914206f9089345900e4a03e21debd2ae7a83