Complete Captcha fix