KeySetups bug fix