Fixed class creation.