Fixing listener binding (removing singletonList).