Fix cloneable buttons finishing...