package class fixed