Fixed issue with '--queue' option