Fixed recently introduced addressing mode bugs.