Fixed post itegration bug...for now