Handle single keys correctly