Something really needs to be done about this