Fixed bug - used wrong id