Added todo comment as reminder for  .addHandler() call fix