Fix integration issue