merged bugfix in keyboard class from master