Fix current_key bug