bug fix enhancement for the command mess up