Fixes the old implementation, at least somewhat.