Fix grabbing keys