Fixed bug where id was null