Fix for site wide bug