Fixed some logic within moving nodes