Comment 4 for bug 1569918

This patch should fix the above mentioned issue when fip is delayed.