Fixed class/package problem