Working fix integration