integration bugfix