fix id from int to long