Changes for edge case double poison pill issue.