Fix for headless servers