Black key bug fix