fixed two invokes of listener