Package hierarchy fix.