Fix class layout 2