Fixed class visibility bug