NPOAdapter: Brought into line with specification