Fixed class override