Fix for (un-)subscribe API.