Ajay | #3067 | Fixing popup after prototype change