Bugfix: got the wrong item
Rework to get rid of deprecated API usage