@emir-hasanbegovic removed buggy support for stable Ids