KeyButtonView Fix (temp, may revert)