It feels like this class is accidentally changed in here...