Fix for default button
Merge branch 'hotfix/0.3.5'