temporary fix for primary key fast forward