Fixing unsubscribe bug