Attempting to fix bug (maybe associated with caching?)