Bugfix Class / ID correlation