Fix to make stuff work