issue #346 made primary key shorter