Fixed another bug with default buttons