Fixed issue with -l switch