common fixed, need to debug why classes are not added