trying to unbreak some things