fix #510
fix -- within class name