Finally fix class-type variable issue....?