Fixes more memoization errors