Unbork it properly