figure classes fix constructor