fixed bug with not working id