Fix this silly key location on all instances