Fixed class impl