Fix even more silliness