temp fix for cross nodes errors