Make sure classname is properly set