fixes #2614 maintenance

Maybe you can prefer ```EntryAdapter``` over ```EntryListener```