Should fix integration setting issue