fixed classes/ v2, core/ v1