change listener to pass only the original object