One more tweak on sqrt handling