Fixed buttons, close #1506.