Fix issue with node changing every checkin