fixed currentcommand bug