Fixed multiple 'addListener' calls.