Bugfix + move to fluidnode for updating