LastCMD Bugfix