Fix for CAPTCHA issue