Fixed command lookup