Fixed problem with ids