Better fix for last commit to allow duplicate list change handlers