Integration Bug Fix

Bug fix for integration before UAT