Change default option and bugfix