Bugfix with currentIds