Bugfix: Incomplete support for the CLI param 'FOLDER'