Fixes bad design i think.