Attempt to fix, again