Fix for OfficeName