NSXtensions fixed