fix class dataser