Fixed class contents splitting