manual fix, again