[cvs-nhc98] patch applied (nhc98): need Unsafe hierarchy in base package