Added replace clause on cinnamon-common