NSXtensions fix