Add bounds check (hardcoded)