Fix losing id