Return correct value for options
Merge pull request #1803 from elzj/queue_changes

Another small fix for 4078