Take two in fixing pop ups