NX-620: Moved key to proper place