Added requote failsafe