Fixed loop when creating new Item