Fix private class variables on models appear to be handled improperly