Fixed queue() not handling extra token properly