Hopefully this does not break anything else

Well, this works here now. Unsure about side effects