Fixes class id reference