Fix defects where done is called before the command's Run method is invoked

Fix defects where done is called before the command's Run method is invoked #498