Fixes By.CLASS_NAME again