Fix for command line options not correctly taken in account
New version for the fix