Improving fix for #1000, no command line option is needed anymore