Fix condition so the new feature is available outside NET_2_1