Fixed calling wrong methods issue in ResourceRemoveListener