removed beg/rescue hack