Fix for Maintenance Mode