Fixed bug due to changing node system