#261 Fixed class-name related bugs