938 request options

possible fix for #938, I can squash the commits after I finish testing it.