Fix for missing FileResolver