Finally fixing the thing