Temp fix for saving nodes