Fix GNP unsubscribe