Add workaround for sqlite ID problem