Fix PR1395, by passing the ID correctly