Fix for class accessability