fix class based constants