Fixed using full lattice matrix