Fixed bug with placement of command on the command queue.
Merge origin/master