Bug Fix to Command Queue