Partly fixing the mess I created