2.1.1 - fix issue with cloned widgets