Class prefix fix