+ fix bug with class