Fixing bad use of archetype :P