trying to fix for multi locality