Hot orm class fix