Fixed duplicating controls bug