Added TODO
More correct fix for bug in EvalCommand