fixes this branch's vulnerability to #325