Merge "Fixing bounds check." into lmp-dev