bugfix send to token instead of id