fixed key stuff