Fixed lookup per command