Fixed #1433 #1434 slightly different (creating one object less per call)
Merge pull request #1437 from noctarius/fixed-entrylistener-with-callback

Fixed #1433 #1434 slightly different (creating one object less per call)