Fix to visiblity_timeout support