Bugfix: Proper id and name