Fix for unsub callback