manual integrated, minor bugfix