Bugfix + CurrentList Handling