Try to fix integration