Fix to use event data signal property