fixed key bug with hacky patch