Fixed command eval code