Fix listening for change on the wrong element