added workaround for key bug