Fixed private class problems