Fixed data.id not being passed in properly