removed hack on id