fixed eval of commands