Integration bugfix