fixed class/instance issue