Attempt to fix NOTFOUND bug